From 54938b0c6db74dadb3360eb84d1032c18bdca99a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 22 Aug 2004 03:56:43 +0000 Subject: [PATCH] Don't use an uninitialized tree iter. (#150414, Torsten Schoenfeld) Sat Aug 21 23:53:39 2004 Matthias Clasen * gtk/gtktreestore.c (gtk_tree_store_swap): Don't use an uninitialized tree iter. (#150414, Torsten Schoenfeld) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreestore.c | 3 ++- 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 641abdd8b1..2fa8cf4bc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Aug 21 23:52:13 2004 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_swap): Don't use an + uninitialized tree iter. (#150414, Torsten Schoenfeld) + Sat Aug 21 23:29:54 2004 Matthias Clasen Fix #150738, Tomislav Jonjic. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 641abdd8b1..2fa8cf4bc1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Aug 21 23:52:13 2004 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_swap): Don't use an + uninitialized tree iter. (#150414, Torsten Schoenfeld) + Sat Aug 21 23:29:54 2004 Matthias Clasen Fix #150738, Tomislav Jonjic. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 641abdd8b1..2fa8cf4bc1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Aug 21 23:52:13 2004 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_swap): Don't use an + uninitialized tree iter. (#150414, Torsten Schoenfeld) + Sat Aug 21 23:29:54 2004 Matthias Clasen Fix #150738, Tomislav Jonjic. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 641abdd8b1..2fa8cf4bc1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Aug 21 23:52:13 2004 Matthias Clasen + + * gtk/gtktreestore.c (gtk_tree_store_swap): Don't use an + uninitialized tree iter. (#150414, Torsten Schoenfeld) + Sat Aug 21 23:29:54 2004 Matthias Clasen Fix #150738, Tomislav Jonjic. diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index e590955a31..b3e2409953 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -2111,7 +2111,8 @@ gtk_tree_store_swap (GtkTreeStore *tree_store, order[i] = i; gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store), path_a, - &parent, order); + parent_node == tree_store->root + ? NULL : &parent, order); gtk_tree_path_free (path_a); g_free (order); } -- 2.30.2